From: Carlos Garnacho Date: Mon, 15 Nov 2021 22:45:47 +0000 (+0100) Subject: gtkgesture: Do not cancel gesture when setting DENIED state X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~91^2^2~142^2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f36ee672265a70cd061f84f7d70975f7971775da;p=gtk4.git gtkgesture: Do not cancel gesture when setting DENIED state Touchpoint state and tracking are tangential, this is mixing up both. This change was added in the fixes for https://gitlab.gnome.org/GNOME/gtk/-/issues/3016 but is now unnecessary. --- diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c index 71a0300ea1..48db916c2f 100644 --- a/gtk/gtkgesture.c +++ b/gtk/gtkgesture.c @@ -1020,7 +1020,6 @@ gtk_gesture_set_sequence_state (GtkGesture *gesture, { GtkGesturePrivate *priv; PointData *data; - GtkEventSequenceState current_state; g_return_val_if_fail (GTK_IS_GESTURE (gesture), FALSE); g_return_val_if_fail (state >= GTK_EVENT_SEQUENCE_NONE && @@ -1044,13 +1043,8 @@ gtk_gesture_set_sequence_state (GtkGesture *gesture, data->state != GTK_EVENT_SEQUENCE_NONE) return FALSE; - current_state = data->state; data->state = state; - if (state == GTK_EVENT_SEQUENCE_DENIED && - current_state == GTK_EVENT_SEQUENCE_CLAIMED) - _gtk_gesture_cancel_sequence (gesture, sequence); - gtk_widget_cancel_event_sequence (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)), gesture, sequence, state); g_signal_emit (gesture, signals[SEQUENCE_STATE_CHANGED], 0,